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