[automerger skipped] Merge Android U (ab/10368041) am: c58b906f58 -s ours am: a8039c72a0 -s ours am: b3a1fc03bc -s ours am: e25c87043d -s ours

am skip reason: Merged-In I1b6866d56f15089babe368bb60335c7ed99bdd6b with SHA-1 0d0d328ce8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-sepolicy/+/24182663

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