Merge "Add unit test to verify that excess app-added networks are only considered for removal when the total number of configs reaches the app-added limit." into udc-mainline-prod