NIAP: Implement BluetoothKeystore feature am: 1ac6f03bcc

Change-Id: Id459308b44fe0f17dd070e8e841f3a1c1e7f80a2