Merge "Audio routing fixes for handover scenarios." into oc-dr1-dev
am: 8e3d34e45f

Change-Id: Id48941d33a480b4b903b1fc57df94534a8e21e13