Merge "Revert onNetworkActive callback behavior on U+" into main am: 3f35bb2fce am: b14df1c65f am: ec20f33db7

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

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