[automerger skipped] Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539 am: 40eec1eaf9 -s ours
am skip reason: Merged-In I66d8e5a0fa1e2245711e8ac90d9daca24802e399 with SHA-1 ecd0886e36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14706912
Change-Id: Iad585efee75d3698628a0f42f6e9fb17f2b54dc9
This commit is contained in: