[automerger skipped] Merge changes from topic "presubmit-am-bed54c4b3fbf4171a0599b645919df07" into udc-dev-plus-aosp am: 20ef7d89 -s ours am: b06177f4 -s ours am: 5596fb62 -s ours

am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 18e9fa72 is already in history

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



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