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

Merge changes from topic "am-cd5a3cea6b294c4983a26f694f5a5c34" into udc-qpr-dev-plus-aosp am: 1d84c2fd -s ours

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 1c3d701c is already in history

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



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