Merge changes from topic 'am-c912808ef06040968a6a3578778fd0b5' into nyc-mr2-dev-plus-aosp

* changes:
  Revert "Revert "Revert "Path fix for backend connection to FE upon call disconnection""" am: bd6ca81fa3 am: 2205dad1ff am: 8e5e4d6f16
  Revert "audio: fix headset + speaker path" am: 9388a729d0 am: 3925384f9d am: 13bbc9b421