Merge changes I99ce72bd,I5a11a802 am: 527ffb6f0c am: 3499d73016

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

Change-Id: Ic26bab1331de18f8b362849e275f986d0b7fa97e