Merge changes from topic "am-5b0e0c62d1e54b2391a32d82c454958a" into...

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