Merge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-dev
am: e0f55c35a5

Change-Id: I1b52ebbf4d08169d4eff1923ffa0c50b46f54ed7