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

Change-Id: I209b829cb62da4da9968eac3c5f92e52672a4b82