Merge changes from topic "am-65f46bf38a3d49f38e0cef3c8bcb6840" into...

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