Merge changes Ie826477d,I5125a3ac am: f8ed984e9c

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

Change-Id: I52678ffbc74b10e5d74c8cce5886543df9a1ad57