[automerger skipped] Merge redfin/bramble support. am: e27412c706 -s ours am: 8cba756bcd -s ours

am skip reason: Change-Id I39678cb2ee2352f49481fadc25a6244f990401b4 with SHA-1 3fa1b8b541 is in history

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

Change-Id: Id60e4b7ae2746b7c593b422a9cab5c860614ad99