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

Merge changes from topic "am-a2396acb6e164fc9aa8ab5e5888e08ae" into udc-qpr-dev-plus-aosp am: 21c77510 -s ours

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

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



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