[automerger skipped] Merge "Audio effect HAL: Add device ID to createEffect API" am: 5dbea795bb am: 9d90cde38e am: d16cee15b0 -s ours
am skip reason: Change-Id I32a6400278496653b4204175cd8a16d81f9724a0 with SHA-1 3b7f51b5fc is in history

Change-Id: I6b7554d7264a851a3c759e2398e1f95ee58a710a