Merge "Fix: ConnectivityManager methods crashing with SecurityException" am: 67f0eebdfa

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

Change-Id: I573cdb1d1d6249fb54c8a0e8c94da1173c3f68e5