[automerger skipped] Merge "Hotword: Add HotwordAudioStream list in...

[automerger skipped] Merge "Hotword: Add HotwordAudioStream list in HotwordDetectedResult" into tm-qpr-dev am: b725e706 am: d5d978e1 -s ours

am skip reason: Merged-In I0953a93195699b17d4a69bba6c4140bc91eecb79 with SHA-1 63935a3f is already in history

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



Change-Id: I0106b520780b8d43571326112dc3caf766dc174a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>