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

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

Change-Id: I33632dfe073e0d8f6a08524c9f2d92025bec7e8b