Refactor Dialogs

Bug:2969342

Change-Id: Ic8d7d4bc6db0ab6b1368035210b2ca2008087d3d
7 files changed