Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev

author Sudheer Shanka <sudheersai@google.com>

Mon, 2 Apr 2018 17:34:16 +0000 (17:34 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 2 Apr 2018 17:34:16 +0000 (17:34 +0000)
author Sudheer Shanka <sudheersai@google.com>
Mon, 2 Apr 2018 17:34:16 +0000 (17:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 2 Apr 2018 17:34:16 +0000 (17:34 +0000)
diff --cc services/core/java/com/android/server/net/NetworkPolicyManagerService.java
Simple merge
author	Sudheer Shanka <sudheersai@google.com>
	Mon, 2 Apr 2018 17:34:16 +0000 (17:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 2 Apr 2018 17:34:16 +0000 (17:34 +0000)