[automerger skipped] Merge "Audio effect HAL: Add device ID to createEffect...
[automerger skipped] Merge "Audio effect HAL: Add device ID to createEffect API" am: 7408b1d5 am: a462b797 am: 84e61fa4 -s ours
am skip reason: Change-Id Ic697eeafbd5df6800ad4c7fd9e0698e3d8e3beae with SHA-1 ceaeee1d is in history
Change-Id: I7b9819ff873c017861c2ba2732618c8d592c7e60