Merge "Create ServiceConnectivityResources" am: eb46aa1c58 am: 4df498eb9a

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

Change-Id: Ia7855ef7125726ecec0c4509b5026aeb5621cd3d