Merge changes from topic "am-5eadb68084e54a2da6b52d9beaa16a8f" into...

Merge changes from topic "am-5eadb68084e54a2da6b52d9beaa16a8f" into udc-d1-dev-plus-aosp am: 745b1ec9 -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/+/24112148



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