Merge changes from topic "am-101c26c6d9444c8f8848bb9aae719535" into...

Merge changes from topic "am-101c26c6d9444c8f8848bb9aae719535" into udc-qpr-dev-plus-aosp am: 6ef11692 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 618767b6 is already in history

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



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