[automerger skipped] Merge "Add pre-share key check for wapi" into sc-qpr1-dev am: 2126390905 -s ours

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

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

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