Merge changes If3217916,I86023b1f into main am: c6dc826c22 am: b2597e6ad5 am: 102b31acf8 am: cd6e9e778e

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

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