Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==" into nyc-dev
am: 7d5c695

* commit '7d5c6955208e82157e6e5ba42ba1d5f1507c6eb6':
  Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==

Change-Id: I3a34b43b8e69fcb99fe88558a705d2a6435179a1