Merge "AudioFlinger: add audio session for device effects" am: 1a1dd970b6 am: 9a26266510

Change-Id: Iea89307fb8a6f0bbd6ebe6ddddfc34ed2616c0d7