Merge changes from topic "am-22e3e5fb31a849e9af11a9e4b06ee3c8" into...

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