Merge "Expose netId to SystemApi" am: cec4a7df3a
am: bd154aca0c

Change-Id: I23f6428954d08761d9671b419887d58dd29171fd