Merge "Merge "Use FakePermissionEnforcer for NetworkManagementServiceTest" into udc-dev am: 0ac26d4d am: a28cc8dd" into udc-d1-dev-plus-aosp am: a2c9daf2

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



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