[automerger skipped] Merge "Add pre-share key check for wapi" into sc-dev am: ad2aab99d3 -s ours am: c4f1922bca -s ours am: 3e385443a7 -s ours am: b419814d93 -s ours

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

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

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