Merge changes I73e6136f,Ifeeb0b29

* changes:
  Revert "Revert "audio policy: fix regression in A2DP playback""
  Revert "Revert "audio policy: add parsing for profile max open and active count""