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

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