Merge "Revert "Migrate to best practise to read network state"" into main am: 634811f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3311056



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