Merge changes Ib1cd342a,Iab23d414 am: 1c5ce5542a

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

Change-Id: I9e62c4780700af6825956d2d5fbf26b7a254b1e1