Merge changes I6745a615,Ic50dc122,I38729c23,I6d1da4f1,I1cef6e09, ... am: e0322e3fd1 am: 612d9d5dec

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

Change-Id: I4886c6230f25f075952ebcb684904b020afb69b5