Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService"
am: 5cdb4c3451

Change-Id: I5bc7a8dae5667a1509f9741be571008a919b6461