[automerger skipped] Introduce Audio V6 am: 2a515e1c27 am: 5c6e084156
am: 1a9bc671f8 -s ours
am skip reason: change_id Ic25d30175032e76e0d3208fb876451de9ae6b7b4 with SHA1 0349c2f03d is in history

Change-Id: I22ccfa6ca23b4b59bd61c0274cc964071e63373e