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

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

Change-Id: I919b54b5527fbe3f9609c6ae70a31a651e4fda90