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