Merge "audio_policy: Add extra check before restoring device in stopOutput"