NIAP: Implement BluetoothKeystore feature am: f635699e99

Change-Id: I979e2b4897209c62af03df5839b38dbcb231aab8