[automerger skipped] Merge "Add pre-share key check for wapi" into sc-v2-dev am: d48cb35031 -s ours am: 40d6ede8be -s ours

am skip reason: Merged-In Id37e395f4f4f05b7901b718e3ea84c56b95cdfe7 with SHA-1 c4142aedf5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/22625072

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