Merge changes Id2ffb056,I2a4e298b am: 420fa2baef am: 9477c7b5ca am: b5697afa2d am: ee4372a572

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

Change-Id: I0eb452855254e1631fb916693a63674a13a35ed0