[automerger skipped] Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539 -s ours

am skip reason: Merged-In I66d8e5a0fa1e2245711e8ac90d9daca24802e399 with SHA-1 f9093389f5 is already in history

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

Change-Id: Idf3c1effc91ef2154ea7361bb9f4c49416d6c70a