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

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

Change-Id: Ibcf989ffd494108faeeb4419041fb32389208c4d