Merge "Run DefaultPermissionGrantPolicyTest every time the DefaultPermissionGrantPolicy is changed"