Merge "Update DPM strings for keyguard features" into mnc-dev