Merge changes from topic "conn_resources_cp" am: 016e0b9261

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635019

Change-Id: I2e4fa4c5f04463163a058806633571862d4eefd5