Revert "Revert "Reduce coupling between DefaultPermissionGrantPolicy and PM""

This reverts commit fa894222e67542f59e126771ad381dd44fd19f87.

Reason for revert: Resubmitting in a topic with the fix for the bug that required the revert

Change-Id: Ia70f966c8757f340ceb14f187e9726c12457403a
6 files changed