Merge changes Ifd6be50a,I857e40c9,I1b9f4fde,Ib3b43cf2 am: 76709a18e9 am: e3c278d4d4 am: 588f846889

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

Change-Id: I5ae99bc67d31140aeca18e54c87b5ef2ecc4e647