Merge "[Keystore] Use Strict for every call into keystore" into main am: 250127b2f8 am: f8bb824a56 am: 60db3309fe am: 15a5f59807

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

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