Merge "Revert "Update NetworkAgent#register to compatible with old NetworkAgentTest"" into main am: 3139f9794c am: 39b701765d

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

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