[automerger skipped] Merge "AudioFlinger: add audio session for device effects" am: 1a1dd970b6 am: 9a26266510 am: e17e0b4f5f -s ours
am skip reason: Change-Id I4e3a55ed1244b918429dd9e217b6efecc1ec6449 with SHA-1 3f75a5bc38 is in history

Change-Id: I0590b13250cb2cfe9b1de24cf806ace9db99ae89