Merge "AudioManager: clean up resource query in constructor"