Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4

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

Change-Id: Id6e8f89870b70332212e9052168e6f7c2faa3ee3
tree: 1841ec62ec64c6b974b67fc8908066a082cc0fcc
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS