Merge changes from topic "am-9bf23b07af1f41679b87dbceba05151b" into...

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