Merge "Remove KeyStore#state()" into main am: 28dc9370ca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768548

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