Merge "Give CTS a way to force-poll network stats." into pi-dev

author Jeff Sharkey <jsharkey@android.com>

Fri, 20 Apr 2018 20:51:02 +0000 (13:51 -0700)

committer android-build-merger <android-build-merger@google.com>

Fri, 20 Apr 2018 20:51:02 +0000 (13:51 -0700)
author Jeff Sharkey <jsharkey@android.com>
Fri, 20 Apr 2018 20:51:02 +0000 (13:51 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 20 Apr 2018 20:51:02 +0000 (13:51 -0700)
diff --cc api/test-current.txt
Simple merge
diff --cc services/core/java/com/android/server/net/NetworkStatsService.java
Simple merge
author	Jeff Sharkey <jsharkey@android.com>
	Fri, 20 Apr 2018 20:51:02 +0000 (13:51 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 20 Apr 2018 20:51:02 +0000 (13:51 -0700)
		1	2
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/net/NetworkStatsService.java	patch \|	diff1 \|	diff2 \|	blob \| history