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

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

Change-Id: I9027708c8145490b7c96fc4ac579f49d7040c0f9