Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 2f96229cbd am: 9da4305183
am: b9c1d6083d

Change-Id: I0a52fc46a22d21147ab7d1594fd79182b5f23eb7
tree: 674c03751772de32819b28d200125c85f8675c98
  1. core/
  2. services/
  3. tests/