Merge changes from topic "am-f87fc8eeddc24f76b86e563109ce3ede" into udc-dev am: 9f73a1c4 -s ours

am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 6888543d is already in history

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



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