Merge "Fix android.permission2.cts.PermissionPolicyTest in Automotive." into sc-v2-dev