Merge "Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather...
Merge "Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==" into nyc-dev am: 7d5c6955 am: 95eac29a" into nyc-mr1-dev-plus-aosp
am: 9a21905a
* commit '9a21905a':
Change-Id: I7663e2c0b3ea45f65796bb2737d93b74cc59424e