Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: c08c9c8d96

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

Change-Id: I6bddf77824763929d694e153e8fa4cccde5d34ea