[automerger skipped] Merge "AudioEffect: add device descriptor to AudioEffect constructor" am: a2630442a7 am: 9007e168b4 am: 65114a0341 -s ours
am skip reason: Change-Id I2a2eba340d3c2537285c091e9a53f305ff161a2b with SHA-1 9487603487 is in history

Change-Id: Ie7dba31d98bbd450e3a08a9ac3efc0cef8d2e64c