Merge changes from topic "am-42d1762e687c49c89c6d20bcaa52e270" into...

Merge changes from topic "am-42d1762e687c49c89c6d20bcaa52e270" into udc-qpr-dev-plus-aosp am: e771fd0e -s ours

am skip reason: Merged-In Idaa7280ed23076b3282c987a249259e0c38b6630 with SHA-1 49454743 is already in history

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



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