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