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

Merge changes from topic "am-bdbb104af243433a896ac7645c3c5b93" into udc-d1-dev-plus-aosp am: 63e37445 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 39f57376 is already in history

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



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