Merge "[Keystore] Use Strict for every call into keystore" into main am: 250127b2 am: f8bb824a

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



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