Merge changes Ic85de603,I57311234,I28fd8637 am: 9a90448aee

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

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