Final cleanup of "password required" dialog

Bug: 3406068
Change-Id: I65c0e8f37236194565cb3a1cf022dfdfdc5c0044
2 files changed