Merge "Skip double adding pregrant perms for role permissions in DPGP Test" into android13-tests-dev