Merge "Audio routing: Fix notification routing during A11y playback" into oc-dr1-dev am: 53f4c18b5a
am: f64d1add0b

Change-Id: I125d4754063892f23ce470a0f72114e0fa7d8782