[automerger skipped] Merge "Split out the connectivity API surface" am:...

[automerger skipped] Merge "Split out the connectivity API surface" am: 3d31f1ea am: 587784cd am: 51b9ccb1 -s ours am: 949bcca3 -s ours

am skip reason: Change-Id I21c42f032efa6c10e36c749df3183ce9679303a7 with SHA-1 9f223cb0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b1eacbd997a1971831d42d8013a77f01bf6b984