Merge changes Ia3ed3c1f,Ib802862d am: f517333c4d

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

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