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

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

Change-Id: I592faf0eaa2e9986a6902cdb20f49a6bc7add7f1