Merge "Pass the right userHandle to AppPermissionGroup" into mnc-dev