[automerger skipped] Merge ab/6749736 in stage. am: 3fa1b8b541 -s ours am: 16b5537257 -s ours am: a41d497938 -s ours

am skip reason: Change-Id I084e1ce2f7e37043485d67eca211a2bafc57c1d4 with SHA-1 4747b45249 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/12804465

Change-Id: Iad8aa2e4b8b704f55a3c5ff3693dfef656d24df8