Merge "Fixes fatal linter errors in android.net.metrics am: 627b424 am: 4acf772" into nyc-mr1-dev-plus-aosp