Merge changes I299dd0df,If4a256df into main am: 568034b1c6

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

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