Merge "Check NetworkAgentInfo Map Before Destroying Network" am: 9d31c63e03 am: 8c06f9991b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802528

Change-Id: I523ebfcd68c9031f6855820ebb0b7b81e448a679