[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-f687a49c0d994aad8f4ed7efce09b6bb" into udc-d1-dev-plus-aosp am: f89a88eb -s ours am: 6407778c -s ours

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b32712 is already in history

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



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