Merge changes I33bc80cc,Ie84e2cd4 am: fd402476f1

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

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