Merge "Fix DefaultPermissionGrantPolicyTest" into pi-dev am: 536cb9c426
am: bb966bd945

Change-Id: I01f2f94adcd2c4e968cd3fb82b5dd32a06eddaf2