Merge changes from topic "am-f4faa2c1-7416-4076-9f85-b0cd734dba65" into cw-f-dev

* changes:
  [automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a am: 982715021c
  [automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a
  [automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda
  AudioFlinger: Prevent multiple effect chains with same sessionId