Revert "Fix DefaultPermissionGrantPolicyTest"

This ended up being not the right fix for the bug, and
had a consequence of AiAi permissions becoming fixed.
Per recent email thread, reverting this back to how it was

This reverts commit 0988f24d.

Fixes: 109665265
Change-Id: Ibf39c3b788c09f189d941f830ebbe8f371fc6f6a