Merge "Removing @Deprecated && @removed method from KeyguardManager."