Merge changes Ia3ed3c1f,Ib802862d am: f517333c4d

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

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