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

Merge changes from topic "am-d7bf1d1363944d12a6bf045f5d30da72" into udc-d1-dev-plus-aosp am: a5c7fa96 -s ours

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 8c2d2c6f is already in history

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



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