Merge "Add getPermissionGrantState method in device policy" into mnc-dev