[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-5488dba4d7974b56980d8cabcd7c3fb5" into udc-dev am: b6082d9d -s ours am: b6ff46df -s ours am: a02c1011 -s ours

am skip reason: Merged-In I5f619ced684ff505ce2b7408cd35dd3e9be89dea with SHA-1 e716a8dd is already in history

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



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