Merge changes I181a490b,Ie2619949,I4bd5fbdf,Ifc0c5baa,I437e6607 into main am: 4518e09375 am: d5f2703ba9

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

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