Merge "Unify the verification for unregister a NetworkAgent" am: 14e14a36ea am: 65fd62fc63 am: 158fae71b4 am: 4cf5bae7c0

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

Change-Id: I5a1f8881fe39f1a386ed576783889ad984e537c2