Merge "Temporary fix for PermissionInfo.FLAG_INSTALLED returned in PackageInfo."