[automerger skipped] Merge "Add audio stream and usage for virtual assistant" am: 653c876b5b am: d271a631d0 am: c5ef701aae -s ours
am skip reason: Change-Id I3696d8fba32070954cc6a330574af8507fea7a74 with SHA-1 3bc7741e91 is in history

Change-Id: Ib023d597685aeec0adbbb2b211c707275da00f52