Merge "Avoid random twice to generate an address" into main am: 692643601d

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

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