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

Merge changes from topic "am-e335adbd630d4c0789ec1821400a5cd6" into udc-qpr-dev-plus-aosp am: ef296f48 -s ours

am skip reason: Merged-In Ie68db6a998fdff1c8b2b79d75650f999bcc55c13 with SHA-1 cf5dace3 is already in history

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



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