Merge "Add new SecurityLevel::KEYSTORE" am: 06e5b50fc3 am: e8302feb75 am: d245a5b96e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1551234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59e8f1e3690b1fe8c33889831400cb04776934f1