Merge changes Iddd50583,I7e6e84ba,If5ade0c0 am: c301b4412b

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

Change-Id: I439961b588bce08953acf5a2b2fd52cb6a2f6066