Merge changes I8843ce7c,I90566998 into main am: 487191dbe6 am: 7b803e68c8

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

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