Merge "Use connectivity resources in service-connectivity" am: 03e53854e5

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

Change-Id: I2169a7c0c8b5eb1073789ffc115cdec73fbe3ab8
tree: a027201be826ecdc6cebd927a4a6ec0278fa4f07
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING