Merge "[JS01]Remove hidden API usage of Connectivity Sevice" am: 0557b8b4c6 am: 7ea1bb7074

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

Change-Id: I7b4e289f13856f8015757d23a478fa923773d37a