Merge "Use connectivity resources in service-connectivity" am: 41869c65a9

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

Change-Id: I2169a7c0c8b5eb1073789ffc115cdec73fbe3ab8
tree: 22cd4d49d4382c7288e080fafe49e753ef57ea21
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING