[automerger skipped] Merge "Fix: ConnectivityManager methods crashing with...

[automerger skipped] Merge "Fix: ConnectivityManager methods crashing with SecurityException" am: 67f0eebd am: 869a79b1 -s ours

am skip reason: Merged-In I956f76be2e0a1a675576511fb394d7ed4354b28a with SHA-1 d90d6457 is already in history

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

Change-Id: I3d77ab7f4ac625c8c6158018f116a231b023c905