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

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

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