Merge "Shutdown hotword detection service when software hotword detector is shutdown" into sc-dev am: 870c4116c1

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

Change-Id: I9924d6806f81245f634217340813323aea73082b