Merge "Fix deadlock of mObject and mDevices in RemoteDevices"
am: ea3e91bcd7

Change-Id: I776cef7d14d3140ee70c243c84a172bff4dd3154