Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb