Hotword: More ding-dong fixes

Thanks Google for making it so hard.

Change-Id: Iaf4cc0804e9a0131d06eb84928038af462a4c15e
Merge "Hotword: More ding-dong fixes" into android-4.4