Merge "Revert^2 "Update NetworkAgent#register to compatible with old NetworkAgentTest"" into main am: dda4052e54

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

Change-Id: Iac69887f42f477c5df15313cd666af39ead94c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>