Merge changes from topic "am-5488dba4d7974b56980d8cabcd7c3fb5" into udc-dev am: b6082d9d -s ours

am skip reason: Merged-In I5f619ced684ff505ce2b7408cd35dd3e9be89dea with SHA-1 f682d0a6 is already in history

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



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