Integrating DialerRingtoneManager and InCallTonePlayer
am: 054559b6c2

* commit '054559b6c279a0149ac6473d1897f6db817c5a57':
  Integrating DialerRingtoneManager and InCallTonePlayer