Merge changes from topic "am-7e4cadcf095a48b8adf4e319af14de2e" into...

Merge changes from topic "am-7e4cadcf095a48b8adf4e319af14de2e" into udc-d1-dev-plus-aosp am: 622ee2eb -s ours

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

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



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