Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: 739bf2569f

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

Change-Id: I22921bc45af46557aa79713815f3e8463bf8a335