Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev