Merge changes I33bc80cc,Ie84e2cd4 am: fd402476f1

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

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