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

Merge changes from topic "am-e20ee2bd25ed403580aa8a11d9865f64" into udc-qpr-dev-plus-aosp am: 12b9b761 -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: I44ebf5166d2ce82ae0cd54a4cc675b9509a6ebed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>