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

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

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