Merge "Shutdown hotword detection service when software hotword detector is shutdown" into sc-dev

core/java/android/service/voice/VoiceInteractionService.java

@@ -520,6 +520,12 @@ public class VoiceInteractionService extends Service {
             // Ignore.
         }
 
+        try {
+            mSystemService.shutdownHotwordDetectionService();
+        } catch (Exception ex) {
+            // Ignore.
+        }
+
         mSoftwareHotwordDetector = null;
     }