[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-6a2334b9a5a446209ba2814ae37bccda" into udc-dev am: 18436ee5 am: 7717eff8 -s ours am: ebc986e4 -s ours

am skip reason: Merged-In I5c9f61aece28a4a07209f5e815630c6ad1ac167a with SHA-1 79d50ab0 is already in history

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



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