Clean up Dialog annotations, lint warnings, and declarations

No functional changes.

Change-Id: If38c9d829d83e762f8c2d05c2fe060c56804b38f
1 file changed