Merge "Remove duplicate method in KeyguardUpdateMonitor" into tm-qpr-dev