Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: c08c9c8d96 am: dc86ef31c6 am: 5e25f6f811

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

Change-Id: I608a6ab159dfb7c172b3741528cc5990d4de6dfa