Merge changes Iddd50583,I7e6e84ba,If5ade0c0 am: c301b4412b am: b4d8eee559

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

Change-Id: I16180792533ca3bbc313ebc3431d21c849221a44