Merge "ToneGenerator: add ringback tone for Japan"