Merge changes from topic "am-109f7458af5d41ceb727cd78287dfa75" into udc-dev am: 1c5290f2 -s ours

am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 8a5223fc is already in history

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



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