Merge "Support dumping according to package name in the PermissionService" into main