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

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

am skip reason: Merged-In I267e05ae7cc7f9eb4859f81d3180ad5258201d57 with SHA-1 16b3e381 is already in history

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



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