Merge "Fixes isDefaultNetworkActive and onNetworkActive unreasonable behavior" am: e0365d45ca am: dd0653ee79

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

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