From: Hugo Benichi <hugobenichi@google.com>
Date: Tue, 30 Jan 2018 00:26:31 +0000 (+0000)
Subject: Merge changes I303d1102,I72c9aa43,If13a5284
X-Git-Tag: android-x86-9.0-r1~237^2~3^2~1^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf5841db8d;p=android-x86%2Fframeworks-base.git

Merge changes I303d1102,I72c9aa43,If13a5284

* changes:
  Fix default network validation overcounting
  Prevent crash in NetworkManagementServiceTest#shutdown()
  Fix ApfTest
---

cf5841db8db0e0446f8ba92b7a3f85b23ff030e7