[automerger skipped] Merge "Create framework-connectivity shared filegroup" am: 87050dde70 am: 7fde212050 am: 7ed3d9833a am: 51f99dbc73 -s ours

am skip reason: Merged-In I3813bc2177b2f0b4237056f64c57c63fa29c3081 with SHA-1 9fd93192c5 is already in history

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

Change-Id: Ia03714dd2186a6ac8c3c943656b81da1aa9a489e