Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235 Change-Id: I062380a2ab0acbb661507df0b48ab50948c0334a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>