[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: ff847ab2d4 -s ours am: 2aa0b4da2d -s ours

am skip reason: Merged-In I351dfd300186a6de8bdcf1edfcb7a461e80670cd with SHA-1 95955a39b0 is already in history

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

Change-Id: If61011ef746d43e6c33b7e4169f3c7e0d7c866e7