Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 5cdb4c3451
am: e7408d4f3e

Change-Id: I5684b4fdc0e1030d372287d53f22b66fe8d90420