Merge changes from topic "am-7de252f86fad434daeb5ed1d2f2aee79" into...

Merge changes from topic "am-7de252f86fad434daeb5ed1d2f2aee79" into udc-qpr-dev-plus-aosp am: bc5c6331 -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 ffae193f is already in history

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



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