[automerger skipped] Merge "Split out the connectivity API surface" am: 306da2a1b5 am: 4a448c175f am: 51b9ccb115 -s ours

am skip reason: Change-Id I21c42f032efa6c10e36c749df3183ce9679303a7 with SHA-1 11b5a5cc71 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0494841fdc78274eda4698e1650be898fc4faf75
tree: 15bd3fdc07d8fa40017c7c9ade4e3f6a14f16825
  1. framework/
  2. service/
  3. OWNERS