Merge changes from topic "backport-connectivityresources" am: 2cff13b0fc

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

Change-Id: Id6e8f89870b70332212e9052168e6f7c2faa3ee3
tree: 95cc6c8eeb6aef275cfa436589dfab8d7c45372c
  1. framework/
  2. service/
  3. OWNERS