[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-6a3c257b422f4d5ca010f2a9ba3a372e" into udc-dev am: ba24a8ca -s ours am: 6f05581b -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: I5574036245769a6a86e5f8932cf156840213076e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>