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

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

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