Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev