Merge "Create service-connectivity.jar" am: bfceacea50

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

Change-Id: Id9b4d44189ad73760ce4c50b7c5b53a94e26fc84