[automerger skipped] Merge "Use connectivity resources in...

[automerger skipped] Merge "Use connectivity resources in service-connectivity" am: efcd27a0 am: 10c557f3 am: de6d2772 -s ours

am skip reason: skip tag Change-Id I778d94a5aac0c4e20e78b1ba3a002495c17a38a0 with SHA-1 6211f92c is already in history

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

Change-Id: Iacd373f6c0e9296aa90d2cd366cd81868f37cfa7