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

Merge changes from topic "am-b70d99834bee4de6b0c60614d6fa745c" into udc-qpr-dev-plus-aosp am: 6662792a -s ours

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

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



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