Merge changes from topic "am-63372c51878b4f3cb935982e8e13e7f2" into...

Merge changes from topic "am-63372c51878b4f3cb935982e8e13e7f2" into udc-dev-plus-aosp am: f6b62f99 -s ours

am skip reason: Merged-In Ib4eef40a0f59512c669b069532e55d36293f9e1c with SHA-1 5545b1cc is already in history

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



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