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

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

am skip reason: Merged-In Ia6fa9681be950adc1b9aae6f7abcd4d7f19db156 with SHA-1 3aa54b2e is already in history

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



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