Merge "fix testSoftApConfigurationGetPersistentRandomizedMacAddress fail" into android13-tests-dev am: 4887886193 am: a7efbc205c am: 584a88c90b am: 320d1271f7 am: 53fa850cdc

Original change: https://android-review.googlesource.com/c/platform/cts/+/2528721

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