Merge "[automerger skipped] Merge changes from topic...

Merge "[automerger skipped] Merge changes from topic "presubmit-am-6a2334b9a5a446209ba2814ae37bccda" into udc-dev am: 18436ee5 am: 7717eff8 -s ours" into udc-d1-dev-plus-aosp am: 1e902184 -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: I2d81784ae0aff5cace68b1decc8c882dd32cece9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>