Merge "Remove usages of hidden connectivity APIs" am: 8d8f48f0fd am: 4ef820417a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddf62ae4f8ade6b3d1965b66a5e983eab6fbab8c