Merge "Make android.net.metrics Event classes @SystemApi am: 4b6dfc2 am: 3a86988" into nyc-mr1-dev-plus-aosp
am: 255c035
* commit '255c035999838c16e8c92d44a312a6e572e65b52':
Change-Id: I89449a89a787a30b46aafc45f62bdb58ae61d3ea
This commit is contained in: