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

Merge changes from topic "am-fc577a610a0f4845b4f51b4c673fb35e" into udc-qpr-dev-plus-aosp am: 0aac7f8b -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: Ibe9c889c6d926db9d6eb9c8c41419c8d374e737c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>