Merge changes I3b7913c5,I9c1d6294 am: 4bd0f6bb2a

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

Change-Id: I127a1454559c97d3901fb7444f8cd9f31bbd39dc