Merge "Model KeyStore security level in keymaster worker" am: ae73ca248e

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1418729

Change-Id: I72df29824042c5e517744f2e19da5cfc9b3c4c8c