Merge changes from topic "am-52bb0c3bd4c94b8d8a7f5998de588de6" into...

Merge changes from topic "am-52bb0c3bd4c94b8d8a7f5998de588de6" into udc-d1-dev-plus-aosp am: 21ecbe53 -s ours

am skip reason: Merged-In I62e829555c43136080ee4909f7dcf8c388165e9f with SHA-1 bcf680d0 is already in history

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



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