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

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

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



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