DO NOT MERGE - Merge ab/7272582 am: b84c777a0f am: 44c313a43a

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

Change-Id: Ib91d186212ae1491e66f520281b1dd1fcb9fb8c5