Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice"