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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4db5f40da99554d2b8aa5c7a89a5f0dc81d082c7