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

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

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