Merge changes I2fc54853,If58ff214

* changes:
  audio policy: fix capture policy for assistant
  Revert "Revert "audio policy: concurrent capture""