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

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

Change-Id: I34a6c05aae52e111e9e023aeb99f1cc7402a79f1
Signed-off-by: Automerger Merge Worker <[email protected]>