Merge "Clear identity in LockSettingsInternal.getUserPasswordMetrics"