Merge "Select correct system audio route in updateAudioRoutes" into oc-mr1-dev am: 43d5d86cda
am: a8a1e989eb  -s ours

Change-Id: I895b5165c9023698eb3b2e3454acd83fc8b8666e