Revert^2 "9/N Clean Up Keyguard Class Structure"

b00c929394cb6bce158265af9606a8eb5a79e47a

Change-Id: I42d17262a789d2eb106a924b442a9d3debcc35e4
21 files changed