Merge "Use PermissionManager for broadcast-delivery permission check" into main