[automerger skipped] Refactor SoundTriggerMiddlewareService am: e617bc85d5 am: 7c7549ce5b am: 375a2cf768 am: 1dcd5d33fc -s ours
am skip reason: Change-Id Ia257021d19c5e6ab6509e85a62173a55f2cf8f7a with SHA-1 51fb07c77c is in history

Change-Id: I1656d776e64c5c8771f76be9273f12652e5f9e97