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 -s ours am: 2b123141
am: d2f11ea5
Change-Id: Id70712795a2e8022482a7649c3b3cdb38a0cfb6f