Merge changes Ifafafcd6,I5802dedc into main am: fbc97d95bb

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

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