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

Change-Id: I3a4dd4a8f418c77fc3879462ef9100a413db53dc