Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into...

Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into udc-qpr-dev-plus-aosp am: b725a914 -s ours

am skip reason: Merged-In I2e2e18a9ec0d1a2fd505464a1297e9b7f9874d1c with SHA-1 026a007f is already in history

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



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