Use single method to handle all popup.dismiss() logic.

Refactor to reduce duplicate code.

Bug: 7902358
Change-Id: I6395635eba435ef6ebe4a34125d9a310c18f7e93
5 files changed