Merge changes from topic "am-45691d6c2fdd4d2db15ca146e86e5465" into...

Merge changes from topic "am-45691d6c2fdd4d2db15ca146e86e5465" into udc-qpr-dev-plus-aosp am: 07a36e9c -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 12c20150 is already in history

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



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