Merge changes I79f2aa8b,I472da0ed into main

* changes:
  Add trunk stable flag for removal of legacy stream type
  [AudioFlinger] remove unused per stream volume/mute getter API