Merge "Create ServiceConnectivityResources" am: d9d976f8f5

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

Change-Id: I91fb801ef2edf64fcaaf082f57eaadb3e7612efa