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

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

Change-Id: Id6e8f89870b70332212e9052168e6f7c2faa3ee3