Merge "Fix NetworkStatsAccessTest"
am: ec1f25a4ba

Change-Id: If949493d9967fa723667947979262bf4f90841c2