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

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

Change-Id: Ia0faab83f0a18f244f88675abc449293ba253f94