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: fba6eec1 am: e8200f05

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

Change-Id: I44f973e9cd61f865ab4b11c1ba38f1c59d725348