Merge change 26396 into eclair

* changes:
  b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.