Merge changes from topic "am-0dfa027d6f0c4684a311b723431afdef" into...

Merge changes from topic "am-0dfa027d6f0c4684a311b723431afdef" into udc-qpr-dev-plus-aosp am: b0500ee9 -s ours

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

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



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