Merge "Follow-up fixes to MusicRecognitionManagerService"