Merge "KeyMint + KeyMaster: Include permissions for FEATURE_HARDWARE_KEYSTORE." am: 94b8b11324

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

Change-Id: I9f222bd43c2380ce7eb0851e109111a161350eda