Merge "A fix pairing test" into main am: b32a92f779 am: 0e2d2149a9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/3046778 Change-Id: Ie0fe75d5695b1b4270c84042350aae5b5403f2ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>