Merge changes Id3eba714,I595ba207 into main am: e149a49c7d am: 6c769d151a

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

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