Merge "Use FakePermissionEnforcer for NetworkManagementServiceTest" into udc-dev