Merge "This text is for dismiss button in dialog that's to dismiss the dialog after a call, instead of to hang up the call." am: 2ac2b7cbf9
am: bf35ebc184

Change-Id: I142ac67dbad8f6d868675f446984079a548a3de8