Merge changes I299dd0df,If4a256df into main am: 568034b1c6 am: 766358b964

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

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