Merge changes I5e12b2c7,Ic79effb1

* changes:
  [audiopolicy][managerdefault] Filter unknown stream for volume settings
  [AudioPolicy][engine][Strategy] fallback on music stream