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

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

Change-Id: Iafd15441005b71103cea730967ad7f3dccc111dd