Merge commit '15233393b0f06894e2ee25e96326d3289905fedf' into manual_merge_15233393b0f06894e2ee25e96326d3289905fedf

Resolve merge conflicts of 15233393b0f06894e2ee25e96326d3289905fedf into nougat-mr1-dev

Change-Id: I3dc3efb4b5bb8445accd2aa809d4b784b67e6b77
diff --git a/3_software/3_2_soft-api-compatibility.md b/3_software/3_2_soft-api-compatibility.md
index 41b7645..23db123 100644
--- a/3_software/3_2_soft-api-compatibility.md
+++ b/3_software/3_2_soft-api-compatibility.md
@@ -345,5 +345,7 @@
 intent to show a dialog to allow the user to change the default Phone application, if the
 device implementation reports `android.hardware.telephony`.
 *   MUST honor the [android.settings.ACTION_VOICE_INPUT_SETTINGS](https://developer.android.com/reference/android/provider/Settings.html#ACTION_VOICE_INPUT_SETTINGS)
-    intent when the device supports the VoiceInteractionService and show a
-    default app settings menu for voice input and assist.
\ No newline at end of file
+    intent and show a default app settings menu for voice input and assist, if
+    the device supports the API class [VoiceInteractionService](https://developer.android.com/reference/android/service/voice/VoiceInteractionService.html)
+    and have more than one application using this API installed at a time.
+