Merge "PackageManager: Add FEATURE_HARDWARE_KEYSTORE, modify FEATURE_STRONGBOX_KEYSTORE." am: b0a08c82bc am: a911b5da56 am: d91def89c0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626660

Change-Id: I15a899ef7ddb405a953203e38337d2e7674f4429