Merge changes from topic "am-472159aba1454fdeb5b78cdc28a0115f" into...

Merge changes from topic "am-472159aba1454fdeb5b78cdc28a0115f" into tm-qpr-dev-plus-aosp am: fb2d2251 -s ours

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

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



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