[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-e8824716c8424da1bdc8c0129cf578a2" into udc-dev am: 17ba0860 -s ours am: d95f72f7 -s ours

am skip reason: Merged-In I40e1aa6377b8a60d91cb2f4189df1e9a4a4578a2 with SHA-1 c60e264a is already in history

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



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