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

Change-Id: I04f88020bcd6221b6ea7da656980cf7e7e92ee03