[automerger skipped] Merge "Move connectivity sources to...

[automerger skipped] Merge "Move connectivity sources to packages/Connectivity" am: b249b941 am: 3eea8f35 am: 0f896443 -s ours am: 3699f612 -s ours

am skip reason: Merged-In I26d1a274058fa38763ad4f605549d880865b4d76 with SHA-1 9bf30999 is already in history

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

Change-Id: I1e38bc8b1f5424baaea7e9a5ac21d1d70801b89a