Merge changes from topic "am-381eacf5c375496798a5dfe8f367b457" into...

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