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

Change-Id: I583f5adcad0a4063fdafa2109d0fb3285a204a42