Merge changes Iddd50583,I7e6e84ba,If5ade0c0 am: c301b4412b am: 0668dceb23 am: 1738ba511e

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

Change-Id: I0af41d8aa5054d0d2e86df77a18667fc6ae1cee0