Merge changes Ib8fe719f,Ia8c05780 am: 7648833bd4 am: f9074acfa3

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

Change-Id: I4726595e33fd379ab0cb02e7d80d166ece680eb7