Merge "Revert "ConnectivityManager#registerNetworkAgent gains an argument"" into main am: 6ea2d705 am: 01eb39bd

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2854408



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