Merge "This text is for dismiss button in dialog that's to dismiss the dialog...
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: 2ac2b7cb am: bf35ebc1
am: 5eb108e5
Change-Id: Ib1d2e55dd22f977a601c8a604c6f6ba162a8fd5f