Merge "SEPolicy changes to support Attestation Verification Service" am: 74fd233c29 am: 08ab454582

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1850953

Change-Id: I8753af7c511f80bea54367b4d9e8441dd0c85d7f