Do not automatically change DesiredCapabilities so equals works the way tests expect

Change-Id: I573f0a7f8544742396fcd5927bc3292350754c6d