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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6397281c5202ed708c7e1506aaf8d8667a83df29