Merge "NetworkTypeController listen directly to setPreferredNetworkType" into rvc-dev