Merge "Merge "Eval dismissKeyguard in KeyguardUpdateMonitor" into tm-qpr-dev am: 82e7167b9c am: 28f290cf22"