Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e

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

Change-Id: I3662e70034b16721e4ad1711654cb9f7eda45d35