Merge changes I99ce72bd,I5a11a802 am: 527ffb6f0c am: 3499d73016 am: 013e9789b7 am: 5137f4f513

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

Change-Id: Idbfe2b145244d834676b86dc8da6b3a45139e832