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

Change-Id: I686e0ffb8d226d9245f1ef6c04bbc8d586c61e81