[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 6d6346c523 -s ours am: 224b7d0ae7 -s ours

am skip reason: Merged-In I47c5e3d165a63b02cf60153d01ca5004c2722807 with SHA-1 a0659023d7 is already in history

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

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