Merge "Make Keyguard a library and make StatusBar the new Keyguard." into master-lockscreen-dev