Merge changes from topic "am-796fff21fcdf4bd78f87d4211faba41f" into...

Merge changes from topic "am-796fff21fcdf4bd78f87d4211faba41f" into udc-qpr-dev-plus-aosp am: 313fcc9f -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: Ic4ad636a475fb31273e6b5d01a45551bfa19172d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>