Merge changes from topic "am-344e0ad780f04ec59d8d217156a3cb70" into...

Merge changes from topic "am-344e0ad780f04ec59d8d217156a3cb70" into tm-qpr-dev-plus-aosp am: f3a2bcc1 -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: I5cc6ed8b14f5b13dfde9566023a5a72ac32ce0ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>