Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo