Merge "Expose netId to SystemApi" am: 1d379ac065
am: 1952cb5129

Change-Id: I23f6428954d08761d9671b419887d58dd29171fd