Merge changes I5af6ce96,Ibc1f6813 am: 3938102448 am: a7033ddecf

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

Change-Id: Idcd5873236e7483786482ee0e3e234071685e0de