Merge "AudioService: more AUDIO_BECOMING_NOISY intent fixes" into oc-dev
am: 4226b27efa

Change-Id: I206d0af2a3463b554b017b3e61f85ce102566cdf