Merge "SEPolicy changes to support Attestation Verification Service"