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

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

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