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