[automerger skipped] Merge "Add audio stream and usage for virtual assistant" am: 7ddab856a7 am: 79b77e410e am: 024fd92016 -s ours
am skip reason: Change-Id I0d718bed46b44e181439437e0934d10f8c23d662 with SHA-1 e612e17763 is in history

Change-Id: I605af0d1f5d8feba335c94bb315e43a878c948e5