Merge changes Ib1cd342a,Iab23d414 am: 1c5ce5542a am: e5b096ba10

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

Change-Id: I46a51cce6e25b99c00e15103095a454e96068b16