Merge "Create a service-connectivity-pre-jarjar library" am: c538773be1 am: fff4d3006c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic63433f13a6ae28880cfaeb6cfd8b61b059562e0