Merge changes I3b7913c5,I9c1d6294 am: 4bd0f6bb2a am: cfa63e2f31

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

Change-Id: I463cdfca281ca428a10b2f9619e0d16daf05c03b