Merge "Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 50f963f022" into nyc-mr1-dev-plus-aosp