Merge "Add NetworkStack metrics to system API" am: 8586a43f31 am: 2aa1bbe018
am: 2f58858d1a

Change-Id: I848ac4c2bb8d35a2f756f97e57f9a61698c00f57