Merge "Remove feature flag for MAC rand open network no captive portal" into udc-dev