Merge changes from topic "am-a2fad34aa94a482192cdf41f97562e31" into udc-dev am: 5cca12a7 -s ours

am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 19a0549e is already in history

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



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