Merge changes I835008be,I200058ce into main am: 4765476646 am: bb67de8e93

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

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