Merge "Patches for IKeyguardStateCallback" into mnc-dev