[automerger skipped] Merge changes from topic "lifecycle-udc-mainline" into...

[automerger skipped] Merge changes from topic "lifecycle-udc-mainline" into udc-mainline-prod am: 9761b6b2 -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 116c3337 is already in history

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



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