[automerger skipped] Merge "Add audio stream and usage for virtual assistant"...
[automerger skipped] Merge "Add audio stream and usage for virtual assistant" am: e5f01a7d am: 173062cf am: e692494b -s ours
am skip reason: Change-Id I17ec0480cad4c3507a97454ccb832255adda9897 with SHA-1 47ea671e is in history
Change-Id: I166f643136eb17a6bf6edf91096815fef5d9548d