[automerger skipped] Merge "Support specific client address configuration"...

[automerger skipped] Merge "Support specific client address configuration" into rvc-dev am: ad6540d6 am: d6ca1051 am: 314f277e -s ours

am skip reason: Change-Id I96bc24a9c30bfc48dff38c3c4456085694fd381c with SHA-1 fd1649fc is in history

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

Change-Id: I7e3c4552533b885a4995e2a31d80936559473951