Merge "Restore the selected route when an app starts to make sound" into...
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev am: d7ff18da am: 96681b8f -s ours
am: bd7a75cf
Change-Id: I5aee24b396ce3aedbdb67754b6735ff72e89b4f9