Merge changes Id3eba714,I595ba207 into main am: e149a49c7d

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

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