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

Change-Id: I68726dc5da9472caed0204be4c30e367761f3ec7