Merge "Added `not_multi_abi` configuration for keystore2_client_tests module." into main am: 90eadc655f am: e4cc28c5b3

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2989155

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