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

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

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