Merge changes I09e780af,I21367c66 am: 94a4149a8f am: 52c99601f6 am: 4d9d1f8176

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

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