Merge "ToneGenerator: fix dual sim ringback tone"
am: 85e8823fc7

Change-Id: Ic77a7c6723b0483aeaac6c83e42722e7f6e6b7c5