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

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

Change-Id: Ic068be012bee6d8b1cd7b974896da9750e6ca453