Merge "Implement AAOS-specific KeyguardViewController and decouple keyguard from statusbar." into rvc-dev