Merge "Remove KeyStore#state()" into main am: 28dc9370 am: ac3cf1f7 am:...

Merge "Remove KeyStore#state()" into main am: 28dc9370 am: ac3cf1f7 am: 4154f307 am: 5d6cf975 am: 751ef205

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



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