Felipe Leme
5210ff9305
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
BUG: 30943463
(cherry picked from commit de2a6f1b1d)
(cherry picked from commit 6670ab4480)
Change-Id: I93cdfc8753dcded141732c0587783d1fa2085f5a