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

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

Change-Id: I5588db4e540440e08f62c90d7369fb308a02b2f6