Merge "Unify the verification for unregister a NetworkAgent" am: 14e14a36ea

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

Change-Id: I56c9f3a74097256190f442e54f0227c495ff9006