Merge changes I6745a615,Ic50dc122,I38729c23,I6d1da4f1,I1cef6e09, ... am: e0322e3fd1 am: 135a9e4e58 am: 1dce3242d0 am: 23494a3f9a

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

Change-Id: I690c021ceba8c8f83bc0d367f97c72113e27e0a3