Merge changes I33bc80cc,Ie84e2cd4 am: fd402476f1 am: a89d0bf43a am: 87c9d87329

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

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