Merge changes from topic "am-5cc785dc345a4a569c11fea0ca4604e8" into...

Merge changes from topic "am-5cc785dc345a4a569c11fea0ca4604e8" into udc-qpr-dev-plus-aosp am: 76c8fc2e -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/+/24605806



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