[automerger skipped] Merge "Create a service-connectivity-pre-jarjar library"...

[automerger skipped] Merge "Create a service-connectivity-pre-jarjar library" am: c538773b am: fff4d300 am: d4d657d8 -s ours am: 91e8b388 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad65cf6672f73ef12ffcd35277fd6c32000fd566