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

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

Change-Id: Ia066b0f53111a4d82357541f146372b964747eba