Merge "KeyguardViewMediator: Play lock screen sound sooner" into cm-11.0