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

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

Change-Id: I8cf9c620078437e1ba4b62aca383209a169c6d8f