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

Merge changes from topic "am-c04d95d6ff114f769d41d79b819b07f8" into udc-qpr-dev-plus-aosp am: 0b2896a6 -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/+/24555955



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