[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-6b765d220b464f71a94f5e0c2eeeea49" into udc-d1-dev-plus-aosp am: 81407f54 -s ours am: aa5f2227 -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/+/24310276



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