Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev am: 4e7b1128 am: c962260f am: 4db9916a

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

Change-Id: I35009fefa95bdd57f3dbd2817486d29537fc0311