Merge "Add framework-connectivity.impl" am: 0fcb8d6db4 am: 74a87c1b2a

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

Change-Id: I3528f9db9537634a5d6dde8a09034bdbc5b1f374