Merge "Merge "Addressing API council comments on NetworkStatsManager." into...
Merge "Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f5586 am: de224ba4" into nyc-mr1-dev-plus-aosp
am: b70946b2
* commit 'b70946b2':
Change-Id: I7a1644a097b8edbaa0da0b80c0e2b6f374f99cf1