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

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

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