[automerger skipped] Merge "Add pre-share key check for wapi" into tm-dev am: 736933fa60 am: 47a93da615 -s ours

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

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

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