Merge changes from topic "am-2a41105a03a94bcf8a076377cdeb2ed3" into udc-dev am: bcfcf9e3

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



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