Merge "Merge "Use FakePermissionEnforcer for NetworkManagementServiceTest"...

Merge "Merge "Use FakePermissionEnforcer for NetworkManagementServiceTest" into udc-dev am: 0ac26d4d am: d2656907" into udc-d1-dev-plus-aosp am: 54acb700

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22789259



Change-Id: I49e69f16845575b5bb0f7d5e34ad7fb528ea221c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>