[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c6240f28a046424a9a19c72ad4994d30" into udc-d1-dev-plus-aosp am: b0978977 -s ours am: 2e78fca3 -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/+/24309763



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