Merge changes I6d0e5d34,I55af0796 into main am: 75551afe7a

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

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