Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539

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

Change-Id: Ibcfb16860cf6e2606ad41607d64c5d8533372855