Merge "Bug: 22477687 CTS RingtoneTest#testRingtone failing" into mnc-dev