commit 77cba4bdf6de8aec02efe0da7e84f17603912b21
author Felipe Leme <felipeal@google.com> Thu Aug 18 15:31:45 2016 -0700
committer Lorenzo Colitti <lorenzo@google.com> Fri Dec 09 13:59:04 2016 +0900
tree 2d5c885a3814c80615b51cd8bfe8c0e619784056
parent ffe5a46b3e65389722333482a959f98767c4c74c

DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.

Most tests were failing because due to a null NetworkCapabilities.
Example:

1) testNetworkStatsWifi(com.android.server.net.NetworkStatsServiceTest)
java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.NetworkCapabilities.hasCapability(int)' on a null object reference
	at
	com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:983)

BUG: 30839080

(cherry picked from commit 574f370c6da52eeffe747248d68ef044617c7bcf)

Change-Id: Ie09b2f43cf6ec745e404d5ec98bd0b072d211ea3