Merge changes Ib1cd342a,Iab23d414 am: 1c5ce5542a

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

Change-Id: I3aab26bc9351e7dd065071b11d58ef9be7224a92