[automerger skipped] Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: 3eea8f3546 am: 0f8964439a -s ours

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

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

Change-Id: Idf91bcf36f6e79ab7f5c91d9939a3b7f742d73dd