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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0e35ba968bf546cd030cb1ddd00b46a5b12c883