Merge "Split connectivity JNI and service jar" am: eeef6c857a am: 550acd58d6 am: 78d2f9ac80

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I914bd578b1c64d43c59541d92ff88e6c5d423ed7