[automerger skipped] Merge "Fix: ConnectivityManager methods crashing with SecurityException" am: 67f0eebdfa am: 869a79b105 -s ours am: 2513079ec9 -s ours
am skip reason: Merged-In I956f76be2e0a1a675576511fb394d7ed4354b28a with SHA-1 d90d6457fb is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1758029
Change-Id: Ib3a8754b06afa9d427f65464f305983457085dd0
This commit is contained in: