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

Change-Id: I043611bfb277979eb3395fe5ef381cc4b383048a