Merge "Add framework-connectivity.impl" am: 0fcb8d6db4 am: e2c7f0103e am: 954160f749

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

Change-Id: Ief30f77f949669d9b52ae3a6fe84f8db91179841