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