Merge "ConnectivityManager#registerNetworkAgent gains an argument" into main am: 7924f93ccb am: 89a8b56840

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

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