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

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

Change-Id: I36a10873c930c961d1b8531abd97e0f295b265a9