NIAP: Implement BluetoothKeystore feature am: f635699e99

Change-Id: I0429507165e76cd3233a316582561ff38c93baf0