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

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

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