Merge changes I8fcaa1f0,I8925fbe4,I78394645,Iadf9f060 am: 48e61a4520 am: f42dc9b164

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

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