Revert "Reduce coupling between DefaultPermissionGrantPolicy and PM"

This reverts commit 47e8820816f2f48afb0e3db670bf5c52c893c2d3.

Reason for revert: 115854330

Bug: 115854330
Change-Id: I44edb7863daa12352935ffdbed701d4772e93132
(cherry picked from commit 91da47f7fa86eb19b06922b88e7d7f4a8acdaaea)
6 files changed