Merge changes I5a88e8ae,I7ffa2df4 into main am: df7fd82c28 am: ce63241ade

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

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