[automerger skipped] Merge "audiofx: add device descriptor to AudioEffect constructor" am: 1eca4b7389 am: 24aeeb12ea am: f6f5c06872 -s ours
am skip reason: Change-Id Iba96aca496cd0588e61c9272922270c4049b7c06 with SHA-1 983db8591d is in history

Change-Id: I0769d970e725a612b95130f5a9ac9cfcbe86c8dc