am fe438e3f: am 8fa24e91: Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev

* commit 'fe438e3f0562d043af0e5c9c8cd97c4977813b20':
  Fix permission check in DPM.getPermissionGrantState