Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev