[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-edab55e843ed4ad9aadca12edf8bcb21" into udc-dev-plus-aosp am: 4185a2f4 -s ours am: cdd0c6e8 -s ours am: e6d8ad7a -s ours

am skip reason: Merged-In Ia52db359691f6076ed04dc9108c26410c7aeb372 with SHA-1 0eec13f3 is already in history

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



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