Merge changes from topic "am-4747c0cec8794ee29743ec0284ab899f" into...

Merge changes from topic "am-4747c0cec8794ee29743ec0284ab899f" into udc-qpr-dev-plus-aosp am: 537cca4f -s ours

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 46daed07 is already in history

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



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