[automerger skipped] Continue playing audio if output to local device is...
[automerger skipped] Continue playing audio if output to local device is selected by the user am: 5be35c56 -s ours
am: a22baa70 -s ours
Change-Id: I592f11ae4fdcd21181f768168b7e790d72dcf156