Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635

author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Thu, 9 Jan 2020 05:59:27 +0000 (05:59 +0000)

committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Thu, 9 Jan 2020 05:59:27 +0000 (05:59 +0000)
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 9 Jan 2020 05:59:27 +0000 (05:59 +0000)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 9 Jan 2020 05:59:27 +0000 (05:59 +0000)
diff --cc services/core/java/com/android/server/connectivity/PermissionMonitor.java
Simple merge
diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge
author	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Thu, 9 Jan 2020 05:59:27 +0000 (05:59 +0000)
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Thu, 9 Jan 2020 05:59:27 +0000 (05:59 +0000)
		1	2
services/core/java/com/android/server/connectivity/PermissionMonitor.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/net/java/com/android/server/ConnectivityServiceTest.java	patch \|	diff1 \|	diff2 \|	blob \| history