Merge changes from topic "am-678891196060408c82afe603de1ef284" into...

Merge changes from topic "am-678891196060408c82afe603de1ef284" into udc-qpr-dev-plus-aosp am: fe375df7 -s ours

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739f is already in history

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



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