Merge "Expose netId to SystemApi"
am: 1d379ac065

Change-Id: I930b421d373ac67ec5987b9440a45e6dbc536074