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