Merge changes Iddd50583,I7e6e84ba,If5ade0c0 am: c301b4412b

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

Change-Id: I03c7b04c7b25e57420ee564f86c503726fded4cd