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: 8a94676e
* commit '8a94676e':
Change-Id: I197069506bca4bc6afe5a1132496269465edef60