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: 15947024

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

Change-Id: I929f85474ab2ea894b6e26ba500f75be89556304