[automerger skipped] Merge "Add pre-share key check for wapi" into tm-mainline-prod am: edcdd67247 -s ours

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

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

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