Merge changes from topic "am-594fd50c98714f25978783b67c3049f8" into...

Merge changes from topic "am-594fd50c98714f25978783b67c3049f8" into udc-qpr-dev-plus-aosp am: 5be53f94 -s ours

am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history

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



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