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

Change-Id: I5684b4fdc0e1030d372287d53f22b66fe8d90420
tree: 2a8fff442cd62894597a828147ce9cdb7dd56679
  1. core/
  2. services/
  3. tests/