Merge "Use connectivity resources in service-connectivity" am: efcd27a0dc

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

Change-Id: I2169a7c0c8b5eb1073789ffc115cdec73fbe3ab8