Merge "Add case DisconnectCause.NORMAL_UNSPECIFIED to play tone ToneGenerator.TONE_PROP_PROMPT" into pi-dev am: 109217750a
am: f27d4a1309

Change-Id: Ib2a438fcf5986d3f5b325672a35f485a6ee11ac1