[automerger skipped] Merge "Added usage to init call for audiostream registration." am: 737a07a0fe am: 76299a31d3 -s ours am: 137568eea2 -s ours
am skip reason: Change-Id I170e0b55d7f90b59d9b5129b22f4a9080957994b with SHA-1 9fb726888d is in history

Change-Id: I38867e0e8dd2dc873b3fa36ee229e03961af7537