[automerger skipped] Merge "Create a service-connectivity-pre-jarjar library" am: 5d3948005d am: a239a8e669 am: d4d657d80b -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8606cfd56baed07c87dc7ae4ba0eb7292d57a72d
tree: 7151b17dca3649552cdd74c7087cf4bb34a9c3c6
  1. framework/
  2. service/
  3. OWNERS