[automerger skipped] Merge "[JS01]Remove hidden API usage of Connectivity Sevice" am: 46196fb05a am: 5746f2c04f am: 721270611c -s ours

am skip reason: skip tag Change-Id Ie6bc81ff382fb242b98f35d28a96defc207c7987 with SHA-1 ebdb0bd277 is already in history

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

Change-Id: I8704e12681669b9a67a53cf2b80eb361f599229f