Merge changes Ic4742bf5,I2c8a8e7f,I755a9a55,I2148bce6 am: 944f9e3da1

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

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