Merge changes I50417e69,I6892d81c,Id8846844,Ib22da8d4,Iad66f0d4 am: 445dede4eb am: 1c019c1748 am: fc8d527a29

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

Change-Id: I6c63ce949a395ac1903a80cbb1d4b1217facd4ac