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

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

am skip reason: Merged-In I66a660c091c90a957a0fd1e144c013840db3f47e with SHA-1 dbdfadc2 is already in history

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



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