Re-add cancel button to discard dialog

b/10097739

Change-Id: I74246e2559e781eadce311205656d29033cb73a6
1 file changed