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

Change-Id: Iea171fc613f8449a88593dcb4c07e63d57b586a6