Merge "Add pre-share key check for wapi" into tm-dev am: 736933fa60

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

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