Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType"