Merge changes I5a88e8ae,I7ffa2df4 into main am: df7fd82c28 am: 1ca88a6ac3

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

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