Merge "implement Dumpable for some keyguard classes"