Merge changes I50417e69,I6892d81c,Id8846844,Ib22da8d4,Iad66f0d4 am: 445dede4eb am: c39923d0bb

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

Change-Id: I055f0f76bf1428040d0ff43efa1336b140af4eb1