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

Merge changes from topic "am-cc2061a0bd214cae81ba61ffef2304a6" into udc-qpr-dev-plus-aosp am: 2804cfad -s ours

am skip reason: Merged-In I68903ebd6d3d85f4bc820b745e3233a448b62273 with SHA-1 3ef3f18b is already in history

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



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