Merge changes from topic "am-2e761c519ac5487eb01ad659547b6f70" into...

Merge changes from topic "am-2e761c519ac5487eb01ad659547b6f70" into udc-qpr-dev-plus-aosp am: 1cf0c262 -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/+/24607943



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