Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev