[automerger skipped] Merge Android U (ab/10368041) am: fa09141c1c -s ours am: e5f772caf5 -s ours am: 093e652ea1 -s ours am: c99f8a8019 -s ours

am skip reason: Merged-In I3991b61b871474a0c9ed6fdd1a10fa9b4f887e55 with SHA-1 12b2e12970 is already in history

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

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