[automerger skipped] Merge "Split out the connectivity API surface" am: 3d31f1ead0 am: 587784cd4c am: 51b9ccb115 -s ours
am skip reason: Change-Id I21c42f032efa6c10e36c749df3183ce9679303a7 with SHA-1 9f223cb0b4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0494841fdc78274eda4698e1650be898fc4faf75
This commit is contained in: