Merge "Add ACTIVITY_SECURITY_OWNERS." into main