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

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

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