Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e am: 93b8b38683 am: 8aa17e2a6a

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

Change-Id: I248bec62a0fd97ee8cdf2a70b35134429b211443