Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev