[automerger skipped] Merge "Audio effect HAL: Add device ID to createEffect API" am: 7408b1d575 am: a462b797c2 am: 84e61fa46d -s ours
am skip reason: Change-Id Ic697eeafbd5df6800ad4c7fd9e0698e3d8e3beae with SHA-1 ceaeee1d73 is in history

Change-Id: I7b9819ff873c017861c2ba2732618c8d592c7e60