Merge changes from topic "am-c19671c8b783407a8419e10d3a7c4c72" into...

Merge changes from topic "am-c19671c8b783407a8419e10d3a7c4c72" into tm-d1-dev-plus-aosp am: 6fa465b4 -s ours

am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 89ebc8c4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518946



Change-Id: Ie928f6968dd3538465c0f78481f233c364cbc367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>