am 483deed6: am 2321e1dc: am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.

Merge commit '483deed6f3d91329d02bb37af64f032e4eaa3621'

* commit '483deed6f3d91329d02bb37af64f032e4eaa3621':
  b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.