Merge "Migrate to best practise to read network state" into main am: 50c7c5e2 am: 4a6dfb93

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



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