[automerger skipped] Merge "Change default disconnect tone to ToneGenerator#TONE_PROP_PROMPT" am: 50de944f7f am: 4a78e465cd am: dcc2781d37 -s ours
am skip reason: Change-Id Ie91087d0af5cff781b966f6e64074be78eb7a436 with SHA-1 1f9a5dac60 is in history

Change-Id: Ib7faa2b8ca67ab67c75ada7334c562a86427bfa2