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

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



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