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

Merge changes from topic "am-dd144c5a72c44e8bbf439a8cb2f98010" into tm-qpr-dev-plus-aosp am: 83282cbd -s ours

am skip reason: Merged-In I9ba57f4347e50f8462cec347e5608ec4d1eb0b30 with SHA-1 73cc189a is already in history

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



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