Merge "Expose some APIs from ConnectivityManager" am: bcf2a79ec8 am: cc2827494a

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

Change-Id: I9dac472715fc8f32cb6313f2df8aef872bec9632