[automerger skipped] Merge "Create a service-connectivity-pre-jarjar library" am: c538773be1 am: fff4d3006c am: d4d657d80b -s ours

am skip reason: Change-Id I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca with SHA-1 911f9ca32d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8606cfd56baed07c87dc7ae4ba0eb7292d57a72d