[automerger skipped] Merge Android 12 am: 4d26cafa8f -s ours am: a6f195154d -s ours am: fcc01ba175 -s ours

am skip reason: Merged-In Idfae2fb505d1558378eace8b1fe41304aed70ab5 with SHA-1 338de3e0d1 is already in history

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

Change-Id: Icabcbce8e88def5d3a4c811a9db14c6a57333c8b
tree: 6a7ed885a667e7eff4b5f6d5fd926bf557d90556
  1. vendor/
  2. bramble-sepolicy.mk
  3. OWNERS
  4. PREUPLOAD.cfg