Merge changes I4ad55f38,Ie8fb633c

* changes:
  Adding method to check if call waiting tone should be played
  Refactored dialer Ringtone code in prep for call waiting
tree: 1ad4087006d42d040b30d8806f465e9579010554
  1. InCallUI/