Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev am: 4e7b1128a4 am: c962260ff6

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

Change-Id: I2fb4b4703f855e2bf63173bf48ff3ec2d1db5225