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

Merge changes from topic "am-b8e53481406d4cfbbf878e7249a82bb8" into tm-qpr-dev-plus-aosp am: 7ae0c025 -s ours

am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc72 is already in history

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



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