Merge changes from topic "am-98ad7f477b5043e98b46a07ba3b5347b" into...

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