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