Merge changes I50be6848,I6f88c028 into main am: b789332691

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

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