Merge "Split connectivity JNI and service jar" am: dfa9e2c0a1 am: fbe03a2069

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2a5b04ad30c0f5d51871859714e4acde0c99277