Merge changes from topic "am-53a777bd7e4e44da8f96a18f5a2dd4fb" into...

Merge changes from topic "am-53a777bd7e4e44da8f96a18f5a2dd4fb" into udc-d1-dev-plus-aosp am: 09fcad30 -s ours

am skip reason: Merged-In Ie817aa0993e9046cb313a750d2323cadc8c1ef15 with SHA-1 0e0819c9 is already in history

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



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