Merge "keyboard: re-add code to detect lid state" into cm-11.0
Merge "PhoneWindowPolicy: Fix NPE race condition by excessive screen on delay" into cm-11.0
Merge "KeyguardViewMediator: Play lock screen sound sooner" into cm-11.0