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

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

Change-Id: I055b54e3051656ce3026512e793c4f94af5d9e52