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

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

Change-Id: If6f17f77cbafa44153f8d856ee417e6fa82c5f6c