Integrating DialerRingtoneManager and InCallTonePlayer am: 054559b6c2
am: 97fbfe5baa

* commit '97fbfe5baaccbd06c19ebde6636ca500278a21f2':
  Integrating DialerRingtoneManager and InCallTonePlayer