Merge "Create service-connectivity.jar" am: bfceacea50 am: b91257f553 am: 5b03885d43

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

Change-Id: I9a04f911043e34c3de1bcac3647773c5adfde294