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: Ib33ffde259bb38e9bc6e33cd83227cbea42ef209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>