Merge changes from topic "am-c955477f6b0a46598ac4a773918dd6fe" into...

Merge changes from topic "am-c955477f6b0a46598ac4a773918dd6fe" into udc-qpr-dev-plus-aosp am: 630bd578 -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/+/24642267



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