[automerger skipped] Merge Android U (ab/10368041) am: ad837e70f4 -s ours

am skip reason: Merged-In Ie57b7ae1cdd680523e78d20809aa9b37051a6808 with SHA-1 71e5601787 is already in history

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

Change-Id: I688424760431023aa9015af103dbb79a2b439938
Signed-off-by: Automerger Merge Worker <[email protected]>