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

Change-Id: Ic513bbc5a9414c5e2c17f05dfaa8f47822bf0f98