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

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

Change-Id: I572d6771cc4d5f078a3f58f5cb52656b94d6887d