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

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

Change-Id: I2aa710d3891c945d417687fda825ef6d87d1d1b3