Merge changes I81bf8969,I2edba513,Ibb913979 am: c06260b5b5

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

Change-Id: I101d828b6cafc7656913a7946062099034ed63db