Merge changes I24816b66,I84ddec9a,Iae64b900,I3bd83e19,Idc910478 into main am: 9734ebfcc7

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

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