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

Change-Id: Ie3f14693a2520a3e6760ec0f798ae6a7a00b8d8a