Merge changes I3b7913c5,I9c1d6294 am: 4bd0f6bb2a

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

Change-Id: Id3a649c64d309f527b216e0404cadaace6ff8cc8