[automerger skipped] [automerge] Add pre-share key check for wapi 2p: 96aaf7f7b2 am: a6984039fe -s ours

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

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

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