Merge "PermissionPolicyTest += SHOW_CUSTOMIZED_RESOLVER" into main