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

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;
     }