[automerger skipped] Merge "Add pre-share key check for wapi" into sc-v2-dev am: d48cb35031 -s ours am: 40d6ede8be -s ours am: 724afbf331 -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: Id6b65e5d1805ff2ad0a7dc1db14675a37bf5a38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>