Merge "Change default disconnect tone to ToneGenerator#TONE_PROP_PROMPT" am: 50de944f7f am: 4a78e465cd

Change-Id: I14fcfae8292e0529b88e7ea722415d178b6ed247