[automerger skipped] Merge Android 12 am: ef32dde3c0 -s ours am: c349ef8a47 -s ours am: 18c4655846 -s ours am: 0209dce05a -s ours

am skip reason: Merged-In I6fa94587515408347e353e4705a7895779e30a3a with SHA-1 0a3cb85552 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bonito-sepolicy/+/1847354

Change-Id: I5dfa599f92ec11779b39311405a62182a61539a9