Merge changes from topic "am-9913171366d14f54a5fafb9a259980c6" into...

Merge changes from topic "am-9913171366d14f54a5fafb9a259980c6" into tm-qpr-dev-plus-aosp am: 7b1c0b34 -s ours

am skip reason: Merged-In I73a87a364a752154e0f96c018b5e5ee8eb505c03 with SHA-1 c55e4b2e is already in history

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



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