Skip double adding pregrant perms for role permissions in DPGP Test

It is possible for a role holding app to also be pregranted permissions
as part of the DPGP. In this case, if the DPGP pregrant is fixed, then
the fixed grant should take precedence over the non-fixed

Fixes: 239766519
Test: atest DefaultPermissionGrantPolicyTest
Change-Id: I5048d849ba731807f9a0807e9cc32e01cb8e92df
(cherry picked from commit d5cff648ea91a1e9b2e123e63fa1cc257405af4e)
1 file changed