Merge "Handle multi-prefixes in Reply message properly." into main am: 5945bd0153 am: 7a2540448b am: 4115539b5f

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

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