Merge changes I301bf032,I8caca97b into main am: e28740f79b

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

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