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

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

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