Merge changes Ic85cab22,I97791a80,I521eb50c am: dd4cecc907 am: 043758af4c am: 6621af8a78

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

Change-Id: I2a045f451b6fe6d2192b960e70c8a26176c621de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>