Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==" into nyc-dev
am: 7d5c6955
* commit '7d5c6955':
Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==
Change-Id: I7d21e0959c8ea8c1928c9065c1ff28d8e9a4c93c