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

Change-Id: I52a17de61821c72e97336eb66f34a56444e13894