Merge changes Iddd50583,I7e6e84ba,If5ade0c0 am: c301b4412b am: 0668dceb23

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

Change-Id: Iae605ba47a8a7dd14125d48a4b0307028cbc4c49