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