Merge changes I6e6b40b0,I6a0d93e0,Ie26f6e52 am: 1004c23b35

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

Change-Id: I5283354f545ef3f9b01f9327e2558314aab1f8f0