Merge "Shutdown hotword detection service when software hotword detector is...

Merge "Shutdown hotword detection service when software hotword detector is shutdown" into sc-dev am: 870c4116 am: aa0b719c am: ed81a6aa am: 925f9ed3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15461817

Change-Id: I533d8a05acd5d996172e3d288ee5d82f3542b5c5