Merge "Add android.hardware.strongbox_keystore feature." into pi-dev