Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService"
am: 2f96229cbd

Change-Id: I5bc7a8dae5667a1509f9741be571008a919b6461
tree: 9633ad958f02a0f74029368070a3cdc2ef2fbe1b
  1. core/
  2. services/
  3. tests/