[automerger skipped] Merge Android U (ab/10368041) am: c58b906f58 -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: I730455ca6a2b3e05281a7f69748d5f610179713f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>