Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
am: d7ff18dac8  -s ours

Change-Id: I88874d4f445b4769e6f5222388b2620f1d2801c6