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

Merge changes from topic "am-d4887cf14e4f4511836e81a161170c48" into udc-qpr-dev-plus-aosp am: b69aeb98 -s ours

am skip reason: Merged-In Ic8d8de5e7cb5f4141d26ab13fc71f9f41769b969 with SHA-1 471eead4 is already in history

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



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