Merge changes from topic "am-6a3c257b422f4d5ca010f2a9ba3a372e" into udc-dev am: ba24a8ca -s ours

am skip reason: Merged-In I2ec5fd036af1d35c6d3fe000ee41f3347f9aea41 with SHA-1 720f8e1f is already in history

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



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